(Makefile.in, readme.xml): From Ron - Use xsltproc and avoid hardcoded pathnames...

config.h.in, configure.in, configure: Add test for sleep.

diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in
index edb6c1a01c8aafc6184af90a9d98f91b3d9c300c..471d5c2e1abe2c884f982cd992a774fb7a280966 100644 (file)
--- a/gpsbabel/Makefile.in
+++ b/gpsbabel/Makefile.in
@@ -129,9 +129,13 @@ dep:
 # Requires CLASSPATH be exported to include full path to saxon.jar.
 # (typically /usr/share/java on a Linux system.)
 readme.html: readme.xml 
-       java  com.icl.saxon.StyleSheet $< \
-       /usr/share/sgml/docbook/xsl-stylesheets/xhtml/docbook.xsl \
-       html.stylesheet="http://www.gpsbabel.org/style3.css" > $@ || rm $@
+       xsltproc --stringparam html.stylesheet \
+         "http://www.gpsbabel.org/style3.css" \
+         http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+         $< > $@ || rm $@
+#      java  com.icl.saxon.StyleSheet $< \
+#      /usr/share/sgml/docbook/xsl-stylesheets/xhtml/docbook.xsl \
+#      html.stylesheet="http://www.gpsbabel.org/style3.css" > $@ || rm $@
        cp readme.html $(WEB)/readme.xhtml
        tools/mkcapabilities
 

diff --git a/gpsbabel/config.h.in b/gpsbabel/config.h.in
index 405ec108a98089d6e1b8ec9510b8ac6b9af5a79c..f0ff994a3583c72bc0d8388eff2552e9a2801f83 100644 (file)
--- a/gpsbabel/config.h.in
+++ b/gpsbabel/config.h.in
@@ -12,6 +12,9 @@
 /* Define to 1 if you have the `nanosleep' function. */
 #undef HAVE_NANOSLEEP
 
+/* Define to 1 if you have the `sleep' function. */
+#undef HAVE_SLEEP
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 

diff --git a/gpsbabel/configure b/gpsbabel/configure
index 6b27bd447faa49d1b20a43a85c323c0e21cc1ce5..caa3e1fce79c67a11a3bab9295b290a27894b5fb 100755 (executable)
--- a/gpsbabel/configure
+++ b/gpsbabel/configure
@@ -2675,7 +2675,8 @@ fi
 # AC_FUNC_VPRINTF
 # AC_CHECK_FUNCS([atexit floor localtime_r memmove memset pow select sqrt strchr strcspn strdup strerror strncasecmp strrchr strspn strstr strtol strtoul])
 
-for ac_func in nanosleep
+
+for ac_func in nanosleep sleep
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5

diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in
index 6003a9c7f11f921c57620914260a19c35463188f..d4696748f89f8e7d2c00db305218a3b63319bda6 100644 (file)
--- a/gpsbabel/configure.in
+++ b/gpsbabel/configure.in
@@ -100,7 +100,7 @@ AC_SUBST(EXPAT_LIB)
 # AC_FUNC_STRTOD
 # AC_FUNC_VPRINTF
 # AC_CHECK_FUNCS([atexit floor localtime_r memmove memset pow select sqrt strchr strcspn strdup strerror strncasecmp strrchr strspn strstr strtol strtoul])
-AC_CHECK_FUNCS(nanosleep)
+AC_CHECK_FUNCS([nanosleep sleep])
 
 #AC_CONFIG_FILES([Makefile
 #                 coldsync/Makefile

diff --git a/gpsbabel/readme.xml b/gpsbabel/readme.xml
index 1b6e9a03affc0a8c89540a177462c4103ce30e4f..5cebd9dc6a4704f4e16ff24cbf7d22f38ccaa876 100644 (file)
--- a/gpsbabel/readme.xml
+++ b/gpsbabel/readme.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!DOCTYPE book
-  SYSTEM "/usr/share/sgml/docbook/xml-dtd-4.1.2-1.0-30/docbookx.dtd">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+   "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
 <book>
    <bookinfo>